Update expected output for CSS style tests

The format for CSS values changed slightly in one of the
previous commits.

diff --git a/testsuite/css/style/currentcolor.nodes b/testsuite/css/style/currentcolor.nodes
index 9724b148f592ac0f185786db69e507653f273b99..5433975291cd2a209e6f7a6048c9ba7993d38e6f 100644 (file)
--- a/testsuite/css/style/currentcolor.nodes
+++ b/testsuite/css/style/currentcolor.nodes
@@ -1,7 +1,6 @@
 [window.background:dir(ltr)]
   decoration:dir(ltr)
   box.horizontal:dir(ltr)
-    color: rgb(255,0,0) (currentcolor.css:4:12)
+    color: rgb(255,0,0); /* currentcolor.css:2:12 */
     label:dir(ltr)
-      color: rgb(255,0,0) (reset-to-defaults.css:2:12)
-      background-color: rgb(255,0,0) (currentcolor.css:8:32)
+      background-color: rgb(255,0,0); /* currentcolor.css:6:32 */

diff --git a/testsuite/css/style/inherit.nodes b/testsuite/css/style/inherit.nodes
index e69f8248a1862af310fa5c8b79c8293c791fdd05..f425af88ac0f3f3f3cdfff165efeb49e91aa22c3 100644 (file)
--- a/testsuite/css/style/inherit.nodes
+++ b/testsuite/css/style/inherit.nodes
@@ -1,9 +1,9 @@
 [window.background:dir(ltr)]
   decoration:dir(ltr)
   box.horizontal:dir(ltr)
-    color: rgb(255,0,0) (inherit.css:4:12)
-    opacity: 0.5 (inherit.css:5:14)
+    color: rgb(255,0,0); /* inherit.css:2:12 */
+    opacity: 0.5; /* inherit.css:3:14 */
     label#label1:dir(ltr)
-      opacity: 0.5 (inherit.css:10:18)
+      color: rgb(255,255,255); /* inherit.css:7:16 */
+      opacity: 0.5; /* inherit.css:8:18 */
     label#label2:dir(ltr)
-      color: rgb(255,0,0) (reset-to-defaults.css:2:12)

diff --git a/testsuite/css/style/label.nodes b/testsuite/css/style/label.nodes
index e967924afcb1b268b1b5897f093c933780f5d8b6..6c82f3064b55f89fc009d7178f22e3c3feb6b298 100644 (file)
--- a/testsuite/css/style/label.nodes
+++ b/testsuite/css/style/label.nodes
@@ -1,6 +1,10 @@
 [window.background:dir(ltr)]
   decoration:dir(ltr)
   box.horizontal:dir(ltr)
-    font-family: "\"Comic Sans\"" (label.css:4:20)
+    font-size: 10px; /* label.css:2:20 */
+    font-family: "\"Comic Sans\""; /* label.css:2:20 */
+    font-style: normal; /* label.css:2:20 */
+    font-variant: normal; /* label.css:2:20 */
+    font-weight: normal; /* label.css:2:20 */
+    font-stretch: normal; /* label.css:2:20 */
     label:dir(ltr)
-      font-family: "\"Comic Sans\"" (reset-to-defaults.css:2:12)

diff --git a/testsuite/css/style/nth-child.nodes b/testsuite/css/style/nth-child.nodes
index 32baabffe9d878f7fcff25c1935a19663d4ff4c9..4af0adcfb90238c8cf205117f2680987a5c134b4 100644 (file)
--- a/testsuite/css/style/nth-child.nodes
+++ b/testsuite/css/style/nth-child.nodes
@@ -3,11 +3,11 @@
   box.horizontal:dir(ltr)
     box.horizontal:dir(ltr)
       label:dir(ltr)
-        font-size: 20px (nth-child.css:4:17)
+        font-size: 20px; /* nth-child.css:2:17 */
       label:dir(ltr)
-        font-size: 30px (nth-child.css:7:17)
+        font-size: 30px; /* nth-child.css:5:17 */
       label:dir(ltr)
-        font-size: 40px (nth-child.css:10:17)
+        font-size: 40px; /* nth-child.css:8:17 */
     box.horizontal:dir(ltr)
       label:dir(ltr)
-        font-size: 50px (nth-child.css:13:17)
+        font-size: 50px; /* nth-child.css:11:17 */